build: Install keybinding files for control-center

As some keybindings are now provided by gnome-shell rather than
mutter, it makes sense to expose those in System Settings.

https://bugzilla.gnome.org/show_bug.cgi?id=671010

diff --git a/.gitignore b/.gitignore
index fb2ec90a2250cbec8f24ae67b1c9c64b08fbb0cc..35f496019690cd67b80748d492f8a7bdcad1ae00 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -16,6 +16,7 @@ config.log
 config.status
 config
 configure
+data/50-gnome-shell-*.xml
 data/gnome-shell.desktop
 data/gnome-shell.desktop.in
 data/gnome-shell-extension-prefs.desktop

diff --git a/configure.ac b/configure.ac
index 2f66dea8a33af1fc3a8d5f2a5f185517fd012778..a8f3cd5b00a9661eac4f4c2b5237e7dd95b4a635 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -106,6 +106,9 @@ PKG_CHECK_MODULES(SHELL_HOTPLUG_SNIFFER, gio-2.0 gdk-pixbuf-2.0)
 
 PKG_CHECK_MODULES(BROWSER_PLUGIN, gio-2.0 >= $GIO_MIN_VERSION json-glib-1.0 >= 0.13.2)
 
+GNOME_KEYBINDINGS_KEYSDIR=`$PKG_CONFIG --variable keysdir gnome-keybindings`
+AC_SUBST([GNOME_KEYBINDINGS_KEYSDIR])
+
 GOBJECT_INTROSPECTION_CHECK([$GOBJECT_INTROSPECTION_MIN_VERSION])
 
 saved_CFLAGS=$CFLAGS

diff --git a/data/50-gnome-shell-screenshot.xml.in b/data/50-gnome-shell-screenshot.xml.in
new file mode 100644 (file)
index 0000000..a8cba7e
--- /dev/null
+++ b/data/50-gnome-shell-screenshot.xml.in
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<KeyListEntries schema="org.gnome.shell.keybindings"
+                group="system"
+                _name="Screenshots"
+                wm_name="GNOME Shell"
+                package="gnome-shell">
+
+       <KeyListEntry name="toggle-recording"
+                      _description="Record a screencast"/>
+
+</KeyListEntries>
+

diff --git a/data/50-gnome-shell-system.xml.in b/data/50-gnome-shell-system.xml.in
new file mode 100644 (file)
index 0000000..4c7e992
--- /dev/null
+++ b/data/50-gnome-shell-system.xml.in
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<KeyListEntries schema="org.gnome.shell.keybindings"
+                group="system"
+                _name="System"
+                wm_name="GNOME Shell"
+                package="gnome-shell">
+
+       <KeyListEntry name="toggle-message-tray"
+                      _description="Show the message tray"/>
+
+</KeyListEntries>
+

diff --git a/data/Makefile.am b/data/Makefile.am
index 055ad3ae27bd15ac70d14a7178ccb3b451e7e30e..6858a4aa062cb998b55afdf641da351a6cb4f855 100644 (file)
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -47,6 +47,13 @@ dist_theme_DATA =                            \
        theme/ws-switch-arrow-up.png            \
        theme/ws-switch-arrow-down.png
 
+keysdir = @GNOME_KEYBINDINGS_KEYSDIR@
+keys_in_files =                                        \
+       50-gnome-shell-screenshot.xml.in        \
+       50-gnome-shell-system.xml.in            \
+       $(NULL)
+keys_DATA = $(keys_in_files:.xml.in=.xml)
+
 gsettings_SCHEMAS = org.gnome.shell.gschema.xml
 
 @INTLTOOL_XML_NOMERGE_RULE@
@@ -73,12 +80,14 @@ EXTRA_DIST =                                                \
        $(introspection_DATA)                           \
        $(menu_DATA)                                    \
        $(convert_DATA)                                 \
+       $(keys_in_files)                                \
        org.gnome.shell.gschema.xml.in.in
 
 CLEANFILES =                                           \
        gnome-shell.desktop.in                          \
        gnome-shell-extension-prefs.in                  \
        $(desktop_DATA)                                 \
+       $(keys_DATA)                                    \
        $(gsettings_SCHEMAS)                            \
        gschemas.compiled                               \
        org.gnome.shell.gschema.valid                   \

diff --git a/po/POTFILES.in b/po/POTFILES.in
index b1a940ca0514b5bb8d90890c513cea8e0510a266..002e74c3fd527e4aac5011d0a342c2921df5b44c 100644 (file)
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,3 +1,5 @@
+data/50-gnome-shell-screenshot.xml.in
+data/50-gnome-shell-system.xml.in
 data/gnome-shell.desktop.in.in
 data/gnome-shell-extension-prefs.desktop.in.in
 data/org.gnome.shell.gschema.xml.in.in

diff --git a/src/main.c b/src/main.c
index ad4fb3ac59a8745021e08cfc803e44b4826faf26..451025d764370029c617f5fc913ef19b71b5863f 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -37,6 +37,9 @@ extern GType gnome_shell_plugin_get_type (void);
 
 #define OVERRIDES_SCHEMA "org.gnome.shell.overrides"
 
+#define WM_NAME "GNOME Shell"
+#define GNOME_WM_KEYBINDINGS "Metacity,Mutter,GNOME Shell"
+
 static gboolean is_gdm_mode = FALSE;
 static char *session_mode = NULL;
 
@@ -374,6 +377,9 @@ main (int argc, char **argv)
 
   meta_plugin_manager_set_plugin_type (gnome_shell_plugin_get_type ());
 
+  meta_set_wm_name (WM_NAME);
+  meta_set_gnome_wm_keybindings (GNOME_WM_KEYBINDINGS);
+
   /* Prevent meta_init() from causing gtk to load gail and at-bridge */
   g_setenv ("NO_AT_BRIDGE", "1", TRUE);
   meta_init ();